extensionUtils: Remove version check for js-version

This is seldomly used, and isn't checked in SweetTooth. Just remove
this inconsistency here rather than adding infrastructure to manage
and check it elsewhere.

https://bugzilla.gnome.org/show_bug.cgi?id=677586

diff --git a/configure.ac b/configure.ac
index 687f55cb4e4ea7c6e7d37994bc69c25b7ff1781a..29354da29d15f21ab361c0a814700f218aec77e0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -105,10 +105,6 @@ PKG_CHECK_MODULES(SHELL_HOTPLUG_SNIFFER, gio-2.0 gdk-pixbuf-2.0)
 
 PKG_CHECK_MODULES(BROWSER_PLUGIN, gio-2.0 >= $GIO_MIN_VERSION json-glib-1.0 >= 0.13.2)
 
-GJS_VERSION=`$PKG_CONFIG --modversion gjs-internals-1.0`
-AC_DEFINE_UNQUOTED([GJS_VERSION], ["$GJS_VERSION"], [The version of GJS we're linking to])
-AC_SUBST([GJS_VERSION], ["$GJS_VERSION"])
-
 GOBJECT_INTROSPECTION_CHECK([$GOBJECT_INTROSPECTION_MIN_VERSION])
 
 saved_CFLAGS=$CFLAGS

diff --git a/js/Makefile.am b/js/Makefile.am
index 82efd21b5e59dd48ba2e5fcb344b01b861a25812..00a15b7462998f9a55e021570768635c0da40235 100644 (file)
--- a/js/Makefile.am
+++ b/js/Makefile.am
@@ -6,9 +6,7 @@ misc/config.js: misc/config.js.in Makefile
        [ -d $(@D) ] || $(mkdir_p) $(@D) ; \
        sed -e "s|[@]PACKAGE_NAME@|$(PACKAGE_NAME)|g" \
            -e "s|[@]PACKAGE_VERSION@|$(PACKAGE_VERSION)|g" \
-           -e "s|[@]GJS_VERSION@|$(GJS_VERSION)|g" \
            -e "s|[@]HAVE_BLUETOOTH@|$(HAVE_BLUETOOTH)|g" \
-           -e "s|[@]SHELL_SYSTEM_CA_FILE@|$(SHELL_SYSTEM_CA_FILE)|g" \
            -e "s|[@]GETTEXT_PACKAGE@|$(GETTEXT_PACKAGE)|g" \
            -e "s|[@]datadir@|$(datadir)|g" \
            -e "s|[@]libexecdir@|$(libexecdir)|g" \

diff --git a/js/misc/config.js.in b/js/misc/config.js.in
index 4326686746583dda8be416fddead04050ac81d31..9769104c41ca77a3b43cdd580c7cc9dc2b538fd4 100644 (file)
--- a/js/misc/config.js.in
+++ b/js/misc/config.js.in
@@ -4,8 +4,6 @@
 const PACKAGE_NAME = '@PACKAGE_NAME@';
 /* The version of this package */
 const PACKAGE_VERSION = '@PACKAGE_VERSION@';
-/* The version of GJS we're linking to */
-const GJS_VERSION = '@GJS_VERSION@';
 /* 1 if gnome-bluetooth is available, 0 otherwise */
 const HAVE_BLUETOOTH = @HAVE_BLUETOOTH@;
 /* gettext package */

diff --git a/js/misc/extensionUtils.js b/js/misc/extensionUtils.js
index 24109d57176a3b314ad9e5b25f8321876e49c110..1065f36935e82702addcd437964e3822bc01d2a3 100644 (file)
--- a/js/misc/extensionUtils.js
+++ b/js/misc/extensionUtils.js
@@ -88,9 +88,6 @@ function isOutOfDate(extension) {
     if (!versionCheck(extension.metadata['shell-version'], Config.PACKAGE_VERSION))
         return true;
 
-    if (extension.metadata['js-version'] && !versionCheck(extension.metadata['js-version'], Config.GJS_VERSION))
-        return true;
-
     return false;
 }